Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge upstream #760

Merged
merged 41 commits into from
Nov 24, 2023
Merged

merge upstream #760

merged 41 commits into from
Nov 24, 2023

Conversation

Legendaxe
Copy link

Что этот PR делает

Обновляемся до оффов

Почему это хорошо для игры

Изображения изменений

Тестирование

Changelog

🆑
add: Это все мерж оффов
fix: Теперь банановые кожурки снова стакаются
del: Удален барбер
add: Добавлено 3 импланта эксклюзивно для КПБ
tweak: Теперь Его Высочество медленее набирает голод
tweak: Теперь Его Высочество сильнее при возвышении, а его носитель получает повышенную регенерацию
tweak: Теперь менять статус с помощью СБ худов можно только имея карточку с доступом
tweak: Теперь бросок станбатона не нокает цель
tweak: Теперь температурная пушка не заряжается сама по себе
tweak: Улучшено снаряжение всех ЕРТ
tweak: дроп бомбы, выбор вывески бара и выбор куда звонить по голопаду теперь тгуи интерфейс с поиском
fix: Ящики и шкафы теперь защищают еду от повяления муравьев
/:cl:

Vi3trice and others added 30 commits November 21, 2023 12:59
…, admins can choose to not change zeroth laws (ParadiseSS13#22842)

* Naughty borgs

* I'm warning you

* typo

* Update law_manager.dm
…spawnability (ParadiseSS13#23009)

* First pass

* do away with old antag hud variable

* rework cannotPossess

* some verification + cleanups

* Update code/modules/mob/dead/observer/observer_base.dm

Co-authored-by: Contrabang <[email protected]>

* splits up log call

* Slightly refactor proc calls, continuing contra's review

* Log admin

---------

Co-authored-by: Contrabang <[email protected]>
…ParadiseSS13#23222)

* Removes old file

- all item icons of 4 items changed. (Holocigar, Havanian Cigar, Cigar, Blunts)

* Resprites Cigars, and Rollies

- all item icons of 4 items changed. (Holocigar, Havanian Cigar, Cigar, Blunts)
- credit to Mcramon for original cigar and holocigar sprite designs.

* Update incoming.

* Resprites Holocigar, Cigars, Premium Cigars, Rollies, and Cigarettes.

- Changes all icons of 5 items. (Holocigar, Cigars, Premium Cigars, Rollies, Cigarettes)

* UPDATE...

* Resprites Cigars, Holocigars, Premium Cigars, Rollies, Cigarettes.

Changes all icons of 5 items
* Fix Research delivery windoor.

* Did a rule of thumb
- rotated window access/helper outside from departament.
* solong

* test

* update

* fixififixx

* ok back to barbers

* spring cleaning

* i hate you safety scissors, genuinely

* space fix

* reviews

* Update sechud.dmi

* Update card.dmi
)

* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

Co-authored-by: Henri215 <[email protected]>

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <[email protected]>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <[email protected]>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <[email protected]>
Co-authored-by: Burzah <[email protected]>
* Oops

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Contrabang <[email protected]>

---------

Co-authored-by: Contrabang <[email protected]>
* FUCK fix drugs first

* done just wait for prs to be merged (sorry s34n)

* removes uneeded chest implant redifine, repair implant

* Apply suggestions from code review

Co-authored-by: Henri215 <[email protected]>

* !human, fluid

* guard variable lisst

* oops

* Apply suggestions from code review

Co-authored-by: DGamerL <[email protected]>

* Apply suggestions from code review

Co-authored-by: DGamerL <[email protected]>

* Update code/modules/surgery/organs/organ_external.dm

Co-authored-by: DGamerL <[email protected]>

* Update code/game/objects/items/stacks/nanopaste.dm

Co-authored-by: DGamerL <[email protected]>

* Apply suggestions from code review

Co-authored-by: Luc <[email protected]>

* lewcs good to them?

* Apply suggestions from code review

Co-authored-by: Luc <[email protected]>

* not needed

---------

Co-authored-by: Henri215 <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Co-authored-by: Luc <[email protected]>
* Make dicebag not a pillbottle

* Fix all other references

* Map update

---------

Co-authored-by: [email protected] <[email protected]>
* This should be most of it

* I forgor to push this

* Makes this look better too

* Slight last things

* This has to be 0

* Fixes everything being broken all at once

* Fixes ascension eating the owner

* Extra insurance

* Removes debug messages

* The most minor of optimalizations

* Sirryan review

* Cleaning up the files

* Update code/game/objects/items/his_grace.dm

Co-authored-by: Contrabang <[email protected]>

* Removes unneeded variables + Lewc review

* Ternary my beloved

* Checks the correct thing

* Less bloodthirst per second and back to 25 victims

---------

Co-authored-by: Contrabang <[email protected]>
…13#23086)

* Added mental to MedHUD

* Made HUDs write based on ID access

* Makes Chamelion secHUD have write access

* adds trailing newline in defines

* med examine spacing adjustment

Co-authored-by: Burzah <[email protected]>

* sec examine spacing adjustment

Co-authored-by: Burzah <[email protected]>

* 0 and 1s

Co-authored-by: Burzah <[email protected]>
Co-authored-by: Luc <[email protected]>

* removes the sec_hud_set call, probably a bad idea

---------

Co-authored-by: Burzah <[email protected]>
Co-authored-by: Luc <[email protected]>
* Reflectors now return materials on deconstruction

* Fix some weird formatting

* Snake case

* Update code/game/objects/structures/reflector.dm

Co-authored-by: DGamerL <[email protected]>

---------

Co-authored-by: Adrer <[email protected]>
Co-authored-by: DGamerL <[email protected]>
* Ezpz

* Removes unnecessary text

* Adds the sound back

* Baton now stuns the hit person

* Present tense
* adds looc to runechat

* remove hearers

* remove unnecessary parens

* Prevent observers from LOOCing runechat

* Update code/game/verbs/ooc.dm

Co-authored-by: Contrabang <[email protected]>

* contra review

---------

Co-authored-by: Contrabang <[email protected]>
* defibs now shock people giving CPR

* use isnull instead

* humanoid like me
* removes boxes part 1

* shorter desc for nano injector

* yeahsure1

Co-authored-by: Burzah <[email protected]>

* yeahsure2

Co-authored-by: Burzah <[email protected]>

* yeahsure3

Co-authored-by: Burzah <[email protected]>

* ok no more kit

---------

Co-authored-by: Burzah <[email protected]>
* Update special_eguns.dm

* HENRI review, also forgot the to_chat change

* Update special_eguns.dm
* fixes being unable to rename paper

* Update code/modules/paperwork/paper.dm

Co-authored-by: Contrabang <[email protected]>

---------

Co-authored-by: Contrabang <[email protected]>
* TGUI Input List

* Formatting

* TGUI re-build

* Holopad & Drop Bomb

* Update tgui.bundle.js

* if

* linter

* Mistake

* TGUI input - Barsign

* Review changes
…seSS13#23282)

* customiZed, removed check that is not needed

* one more typo

* fuck it this is right in brenglish

* not need /human here

* even better
* Let lockers prevent ants

* Refactor ants check; exclude closed lockers and cardboard boxes from turf structure check

* Make the structure check more lenient, convert to typecache

* gnarg

* gnarg 2: Electric Boogaloo

* Minor simplification/optimization
GDNgit and others added 10 commits November 24, 2023 15:37
…#23293)

* Add colored shoes to loadout

* Allow crafting of satchels
* destination tagger UI improvements

* Update code/modules/tgui/modules/destination_tagger.dm

Co-authored-by: Contrabang <[email protected]>

---------

Co-authored-by: Contrabang <[email protected]>
* reduces a massive amount of endround lag

* more improvements
* fixes xeno headslugging not working

* tweak

Honestly I think the logic behind this is super fucking questionable, so have fun changing this back in like five years me

* Update code/modules/mob/living/simple_animal/hostile/headslug.dm

Co-authored-by: S34N <[email protected]>

* Update code/modules/mob/living/simple_animal/hostile/headslug.dm

---------

Co-authored-by: S34N <[email protected]>
@github-actions github-actions bot added 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. TGUI Кто-то решил потрогать интерфейсы. labels Nov 24, 2023
@ss220bot ss220bot added the 📜 CL валиден Этот чейнджлог будет успешно опубликован label Nov 24, 2023
@github-actions github-actions bot added the Кибериада Этот ПР изменил что-то на Кибериаде (BoxStation) label Nov 24, 2023
@Legendaxe Legendaxe force-pushed the master branch 3 times, most recently from b09c991 to 0406e27 Compare November 24, 2023 21:59
@github-actions github-actions bot added Керберос Этот ПР изменил что-то на Керберосе (DeltaStation) Цереброн Этот ПР изменил что-то на Цереброне (MetaStation) labels Nov 24, 2023
map fix
@Legendaxe Legendaxe merged commit afa9135 into ss220club:master Nov 24, 2023
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден Этот чейнджлог будет успешно опубликован TGUI Кто-то решил потрогать интерфейсы. 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. Керберос Этот ПР изменил что-то на Керберосе (DeltaStation) Кибериада Этот ПР изменил что-то на Кибериаде (BoxStation) Цереброн Этот ПР изменил что-то на Цереброне (MetaStation)
Projects
None yet
Development

Successfully merging this pull request may close these issues.